Add merge.renormalize=true to .git/config additions to avoid merge conflicts from kwexpander.
Merge branch 'master' of https://github.com/KhronosGroup/KTX