Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Apr 2015 15:14:36 +0000 (11:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Apr 2015 15:14:36 +0000 (11:14 -0400)

Trivial merge