Merge branch 'develop', fixing google synth api
Merge branch 'master' into develop