release 4.0.4
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into zunda-local