Merge branch 'hotfix/1.2.12' v1.2.12
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 16:31:16 +0000 (12:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 16:31:16 +0000 (12:31 -0400)

Trivial merge