2_10_6_pre3
Merge pull request #1120 from belforte/master

2_10_6_pre3