bug 812265

All three patches from 812265 now done and have r+ from glandium.