Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jan 2016 20:09:07 +0000 (15:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jan 2016 20:09:07 +0000 (15:09 -0500)

Trivial merge