Merge branch 'hotfix/1.6.28' v1.6.28
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Mar 2017 18:28:33 +0000 (14:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Mar 2017 18:28:33 +0000 (14:28 -0400)

Trivial merge