fixed a bug that caused dreams to never become dreamt
Merge branch 'master' into combathelp