Release: Version 2.2.1 (nightly)
Merge pull request #1227 from am11/master

Release: Version 2.2.1 (nightly)