Develop

Merge v1.2.4 ready for release.