Merge branch 'hotfix/v1.0.6' vv1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 May 2015 20:49:05 +0000 (16:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 May 2015 20:49:05 +0000 (16:49 -0400)

Trivial merge