Utils: xINC macros simplification.
Merge branch 'utils' into xtile
Merge branch 'xtile' into xtile-gaps