Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Aug 2016 12:40:14 +0000 (08:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Aug 2016 12:40:14 +0000 (08:40 -0400)

Trivial merge