Merge pull request #578 from phervieux/15.10