Merge branch 'hotfix/1.6.27' v1.6.27
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Mar 2017 18:30:43 +0000 (14:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Mar 2017 18:30:43 +0000 (14:30 -0400)

Trivial merge