Fix compile error introduced with last commit
Merge branch 'master' into release-0.15.0