Merge pull request #168 from ilios/master

roll master into 2.3 release branch