Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 16:27:28 +0000 (12:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 16:27:28 +0000 (12:27 -0400)

Trivial merge