Hopefully setup.sh should now run without commiting
Merge remote-tracking branch 'public/master'
Merge branch 'master' into develop