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