Merge branch 'hotfix/1.2.28' v1.2.28
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Aug 2016 18:51:14 +0000 (14:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Aug 2016 18:51:14 +0000 (14:51 -0400)

Trivial merge