Hoping to fix a migration problem on deployment server.
Merge branch 'master' into ontohub.org