changelog entry for 44edcd66f49c46c8e7acdc18b653b9685aa2f3f0 and c17b8554e3ba8fe73b960c74c05dd8ee0698b1bd, closes #913
merge c17b8554e3ba8fe73b960c74c05dd8ee0698b1bd...59b84eca3aa6736dd2cbfc836908ab16da185f9f (from 0.11)