v2.2.1

Closed Oct 2, 2017 100% complete

Minor release to fix issues not initially closed in v2.2.0