Merge pull request #3294 from bmiklautz/misc_build
authorNorbert Federa <nfedera@users.noreply.github.com>
Tue, 19 Apr 2016 13:32:56 +0000 (15:32 +0200)
committerNorbert Federa <nfedera@users.noreply.github.com>
Tue, 19 Apr 2016 13:32:56 +0000 (15:32 +0200)
Misc build and test fixes


Trivial merge