Slight changelog mistake
build system changes to support new release versioning
Merge remote-tracking branch 'upstream/master' into Xcode