fixes #735
fixes #844
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
bootstraps again