Merge branch 'master' into zheilbron/hyracks_msr_demo