strange casing bug that only appears on some machines.
Merge branch 'master' into release/1.4
Merge branch 'release/1.4' into develop