Capture for later use with packer.io
Merge chris' changes