Merge branch 'master' into feature/842-districts
re #842 - Disabled migration because of unknown phpmig issue
Merge branch 'feature/842-districts' into staging