Merge branch 'hotfix/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 20:44:12 +0000 (15:44 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 20:44:12 +0000 (15:44 -0500)

Trivial merge