Merge remote-tracking branch 'origin/precise-prod' into quentin/novnc