Working towards 2.2.0.
Merge pull request #1172 from square/jw/master-version

Working towards 2.2.0.