Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 20:31:10 +0000 (16:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 20:31:10 +0000 (16:31 -0400)

Trivial merge