Merge pull request #437 from aguibert/108-backports

Version 1.0.8 backports