Merge commit 'local_master/planetlab-3_2-branch' into planetlab-3_2-branch