Merge pull request #3033 from akoeplinger/fix-xbuild
authorAlexander Köplinger <alex.koeplinger@outlook.com>
Mon, 23 May 2016 13:52:17 +0000 (15:52 +0200)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Mon, 23 May 2016 13:52:17 +0000 (15:52 +0200)
Various xbuild 14.0 fixes


Trivial merge