Version bump
Merge branch '1.0.3'
Merge branch 'master' into dev