Merge pull request #2276 from bmiklautz/build_fixes
authorNorbert Federa <nfedera@users.noreply.github.com>
Mon, 15 Dec 2014 12:51:47 +0000 (13:51 +0100)
committerNorbert Federa <nfedera@users.noreply.github.com>
Mon, 15 Dec 2014 12:51:47 +0000 (13:51 +0100)
Build fixes


Trivial merge