typo...
Merge branch '1.0/develop' into 1.0/release
bump to 1.0.5