Fixes issue where dev mode would interfere with localisation editing
Merge branch 'fix/dev_mode' into develop