CDH 4.7
Merge pull request #25 from Shopify/cdh-4.7

CDH 4.7