Updates from Evgenij Belikov.
Merge branch 'master' into gh-pages
v2.9