Bug fix to master.
Merge branch 'master' into testing-branches