Minimized impact of compilation macros
Merge branch 'stable' of https://github.com/edrumwri/Moby into stable