Merge branch 'master' into hyracks-merge2