fix for 2.10 compilation
Merge branch 'release/0.9'