More fall-out from the platform directory move.
Merge remote-tracking branch 'upstream/master'