Merge pull request #670 from breautek/fix/camera-perms