2_10_4_patch4
Merge pull request #1082 from belforte/master

2_10_4_patch4