Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Jan 2017 14:32:24 +0000 (09:32 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Jan 2017 14:32:24 +0000 (09:32 -0500)

Trivial merge