Rory Pickering 36b39ee726 Merge branch 'master' into master %!s(int64=8) %!d(string=hai) anos
..
permissions.android.js cfa6577d93 Fix commonJS imports %!s(int64=8) %!d(string=hai) anos
permissions.ios.js 36b39ee726 Merge branch 'master' into master %!s(int64=8) %!d(string=hai) anos