Cacher UML and SRC
Merge branch 'master' of https://github.com/mshortall/shuttle