Document resolution to #836.