2.1.1 RC1 - cleanup
Merge branch '2.1.1' of github.com:CompendiumNG/CompendiumNG into 2.1.1