Remove update script from master for now
Merge branch 'master' into develop