Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:46:31 +0000 (14:46 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:46:31 +0000 (14:46 -0500)

Trivial merge