Merge branch '2-1-develop' into 2-1-master
Bumped version
Merge branch '2-1-master' into 2-1-develop