Merge branch 'hotfix/1.5.28' v1.5.28
authorSteve Sutton <steve@gaslightmedia.com>
Sat, 20 May 2017 15:58:01 +0000 (11:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Sat, 20 May 2017 15:58:01 +0000 (11:58 -0400)

Trivial merge