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