Merge proposals dependent on lp:~thomas-voss/platform-api/fix-1202309

lp:~thomas-voss/platform-api/fix-1202309 has no merge proposals.