Merge remote-tracking branch 'origin/myplc-0_4-branch' into planetlab-3_3-bootcd...