Merge pull request #185 from ilios/master

roll changes to master into release branch