V 1.0.4
Merge pull request #9591 from anoiaque/master

V 1.0.4