Merge branch 'weimer_929' of github.com:Microsoft-CISL/REEF
Merge branch 'master' of github.com:Microsoft-CISL/REEF