merge 0528e2cce436563f21a3dc0e0bab72f815fe2d4a, refs #987
cleanup
cleanup
merge d72e8e2273e8a80692ee1866cd9aee1cd612a58c...159492ce8c8831f25998cc2c6f06016df5c0de95 (from 0.11)
cleanup