Merge remote-tracking branch 'oc/master' into fix-camera-for-q