Merge back from Renaud

Looks like I get to work with platform folders again...