version bump
Merge remote-tracking branch 'origin/master' into rest-api