for ede
Merge branch 'galago-3.5' of github.com:daltonj/CIIRShared into galago-3.5