formatting [ci skip]
Merge branch 'develop' of github.com:timmolter/XChange into develop