bump version
Merge remote-tracking branch 'origin/master'
docs
Updating version on trunk after tagging