Merge pull request #552 from jbondpdx/2.1.x