Merge branch 'master' of https://github.com/jamesbigler/Legion
Merge branch 'master' of https://github.com/jamesbigler/Legion