Update to 3.6-SNAPSHOT
HP: Dementor improvements