Un-bumping version
Merge remote-tracking branch 'origin/master' into ravenlocals