Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Jun 2016 15:42:29 +0000 (11:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Jun 2016 15:42:29 +0000 (11:42 -0400)

Trivial merge