Version 2.0.0 prerelease
Merge remote-tracking branch 'upstream/master'
Add OSX Mavericks support to platform.mk