This bug is fixed in the releases/2.1 branch and is now available in the 2.1.1-beta release available here.