Merge remote-tracking branch 'origin/pi-release' into pi-release

Fixes the snap that didn't happen in PPR1.180606.001.