Merge remote-tracking branch 'origin/rfxfix'
Merge remote-tracking branch 'upstream/master' into compfix
Android: Fixed JNI regenerate script
Merge pull request #1088 from mfleisz/jniscript

Android: Fixed JNI regenerate script
iOS: Compile fixes (Fixed #1069, #1086)
iOS: Compile fix
Merge pull request #1089 from mfleisz/compfix

iOS: Compile fixes (Fixed #1069, #1086)
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'