This is now fixed in trunk. 2.1 has already branched off so this also needs to be landed there. The bug is not present in the 2.0 branch.
This is now fixed in trunk. 2.1 has already branched off so this also needs to be landed there. The bug is not present in the 2.0 branch.