bug 788

This is for the master branch.