fixed #354.
Merge branch 'master' of github.com:ilios/ilios into cleanup