fixes #1274
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel