Merge branch 'master' of https://github.com/keithchambers/packer-package
Merge branch 'master' of https://github.com/keithchambers/packer-package