Merge branch 'release/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Nov 2016 20:08:09 +0000 (15:08 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Nov 2016 20:08:09 +0000 (15:08 -0500)

Trivial merge