Version 1.0.4
Merge pull request #5410 from simoncoulton/master

Version 1.0.4