Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Oct 2015 19:40:01 +0000 (15:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Oct 2015 19:40:01 +0000 (15:40 -0400)

Trivial merge