updates from slac
Merge branch 'master' of github.com:alexis-s/alexis-exo