Merge branch 'develop'
Bump version, update docblock
Merge branch 'release/4.0.3'
Merge branch 'master' into develop