Merge pull request #185 from ilios/master

roll changes to master into release branch
Merge pull request #186 from ilios/rb2.3

Merge pull request #185 from ilios/master