Merge remote-tracking branch 'origin/master' into camera-tutorial
Changes after review.