Merge branch 'hotfix/1.0.6.2' v1.0.6.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:43:28 +0000 (11:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 22 Sep 2014 15:43:28 +0000 (11:43 -0400)

Trivial merge