Merge pull request #573 from HelenCampbell/release2.2.1 2.2.1
authorBryan Jen <bryan.jen@gmail.com>
Tue, 24 Nov 2015 19:04:29 +0000 (12:04 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Tue, 24 Nov 2015 19:04:29 +0000 (12:04 -0700)
Release 2.2.1


Trivial merge