Merge branch 'hotfix/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 19:57:26 +0000 (15:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 19:57:26 +0000 (15:57 -0400)

Trivial merge