changelog entry for cac07065a6d4571082774f0162e746d6200d37af and 5b21477714ce284ab954782122356f65f8f2b3d1, closes #832
merge 5b21477714ce284ab954782122356f65f8f2b3d1 to 52833a363c0a656987cf432922956ee91818aad1 (from 0.11)