Merge pull request #553 from bmjen/2.1.x_mergeback