Fix for 6.1 (6A1052d).
Merge branch 'master' into db