Bugfixing Part 1
Merge branch 'developing' into mirakel2.2
Fic Bugs Part 2