Merge branch 'master' into zheilbron/hyracks_asterix_issue470