Merge branch 'hotfix/1.2.27' v1.2.27
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Jun 2016 15:53:39 +0000 (11:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Jun 2016 15:53:39 +0000 (11:53 -0400)

Trivial merge