Merge branch 'master' into dev/hyracks_msr