Merge branch 'master' into develop
Merge branch 'master' of https://github.com/dwightwatson/validating into develop