Update package.json for publishing
Increment version
Merge remote-tracking branch 'origin/master' into build-config