2_10_6
Merge pull request #1129 from belforte/master

2_10_6