Merge branch 'hotfix/1.0.9'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Nov 2015 14:44:15 +0000 (09:44 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Nov 2015 14:44:15 +0000 (09:44 -0500)

Trivial merge