7 [MERGED] Fix #787

by Skipper

10 Fix cloak of shadows

by Lenny