Comment 20 for bug 1071492

Pushed both to MM_06 and git master.