Fix for 6.1 (6A1052d).
Merged from master.