2.2 Release: Merging unstable into master