Merge commit '164cc8091571ad11261a91eed68e06d2e73ea490' into nanzhang/hyracks_genomix