Merge branch 'hotfix/1.0.6.1' v1.0.6.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:30:49 +0000 (11:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:30:49 +0000 (11:30 -0400)

Trivial merge