Merge branch 'hotfix/1.2.27'
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Jun 2016 17:12:09 +0000 (13:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Jun 2016 17:12:09 +0000 (13:12 -0400)

Trivial merge