Assets 2
Merge pull request #321 from mlaventure/cherry-pick-exec-fix-for-release

Fixes for Docker 1.12.2