Merge branch 'master' into no_build_script

Conflicts:
Instabug.framework/Versions/A/Instabug