Merging bleeding edge branch to master

Hopefully it builds now, since the master branch doesn't build.