Merge branch 'issue-853349' of git://github.com/gasolin/gaia into gasolin-issue-853349

Conflicts:
	apps/camera/js/camera.js