Thanks for reporting the problem and providing a fix.
Fixed in branches master and 2.1.x. Not required in branch 2.0.x.
Thanks for reporting the problem and providing a fix.
Fixed in branches master and 2.1.x. Not required in branch 2.0.x.