Make it compile
Merge pull request #1468 from erwinwinder/master

Make it compile