Merge branch 'hotfix/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 14:12:26 +0000 (10:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 14:12:26 +0000 (10:12 -0400)

Trivial merge