The fix for this bug has introduced a small regression: bug 1451107
Fix has gone into master, changing version to 2.0 with target release 2.1. Please duplicate for other versions as necessary.