Merge branch '2.2-dev' into 'master'
2.2 Release Closes #130, #68, #140, #143, #113, #114, #111, #55, #54, #76, #122, #43, #119, #108, #39, #124, #131, and #57 See merge request !100
2.2 Release Closes #130, #68, #140, #143, #113, #114, #111, #55, #54, #76, #122, #43, #119, #108, #39, #124, #131, and #57 See merge request !100