Currently this won't automatically merge, I was wondering if you could resend the pull request to the 2.1.x branch so it can go into 2.1.5 and 2.2.2?