2_11_1_pre11
Merge pull request #1221 from belforte/master

2_11_1_pre11