Fix for compile issue on Fedora 20
Merge branch 'master' of https://github.com/JamesWrigley/nitrogen