Changed back to update from drop-create, so now it works.
Merge branch 'master' into securityandusers