Apply 243 onto 299 maintenance

Created by: JonRowe

This applies #315 onto 2-99-maintenace as opposed to master.... Quoting @myronmarston: #243 got applied to the 2-13-maintenance branch but somehow wasn't applied it to master :(. Which means there was a regression in 2.14.0.rc1 that this fixes.

This already got code reviewed by @alindeman originally, so I'm just doing a PR to ensure the travis build is green with this against all supported rubies.