2_11_1_patch1_pre2
Merge pull request #1231 from belforte/master

2_11_1_patch1_pre2