Merge pull request #63 from hintjens/master

Backported fix for #909
Bumped NEWS for 4.0.4 release