Merge branch 'release-1.0.4' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Adjustments to 'collection_locations' table in 'create.sqlite.sql'.
Merge branch 'develop'