Merge branch 'hotfix/1.2.12' v1.2.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Jun 2017 17:09:26 +0000 (13:09 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Jun 2017 17:09:26 +0000 (13:09 -0400)

Trivial merge