Version 4.0.6
Merge pull request #791 from LaurentGoderre/v4.0.6

Version 4.0.6