Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Jun 2016 15:32:36 +0000 (11:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Jun 2016 15:32:36 +0000 (11:32 -0400)

Trivial merge