2.1.0

Merging 2.1.0 branch into master