Merge @moschlar's hotfix back into develop.

.... if we can!