Fixed a regression caused by the previous commit.
Merge branch 'master' into devel