Apply #656 to master

[devmotion]

When investigating the diff between master and release-0.10, I noticed that #656 was only applied to the release-0.10 branch. It doesn't contain any explanation or discussion, so it's a bit difficult to tell immediately how useful and important #656 is. But I think it'd be good to avoid such discrepancies between master and release-0.10.