Merge branch 'release-2.2'
Merge branch 'develop'
Merge commit '783d01e'
fix compilation error on Amazon AMI
Merge remote-tracking branch 'origin/master' into feature/UCD