Merged from BUILD_BRANCH. Note: There is one problem. The HDF testcases are failing for me which prevents the full build from running. Committers, please feel free to tweak the build on your own now.