Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:05:13 +0000 (11:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:05:13 +0000 (11:05 -0400)

Trivial merge