Merge branch 'hotfix/1.2.8' v1.2.8
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 May 2016 15:01:47 +0000 (11:01 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 May 2016 15:01:47 +0000 (11:01 -0400)

Trivial merge