Fix https://www.pivotaltracker.com/story/show/78202744
Merge branch 'master' of https://github.com/teem2/dreem