Merge pull request #1 from caron/master

Master
Merge pull request #2 from caron/fe_1.11_wip

Merge pull request #1 from caron/master