Merge branch 'hotfix/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 14:28:21 +0000 (10:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 14:28:21 +0000 (10:28 -0400)

Trivial merge