Merge branch 'release/v1.22' into develop
Merge remote-tracking branch 'upstream/develop' into update-openssh-6.6.1p1-3

* upstream/develop: