doc madness
doc override
Version 2.1.1 version bump
Merging release-2.1.1 to master