2_10_4_pre1
Merge pull request #1040 from belforte/master

2_10_4_pre1