Commit VERSION 2.1.0
Commit VERSION 2.1.0
Merge staging release 2.1.0 with master
Merge remote-tracking branch 'origin/staging' into develop