Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 17:13:32 +0000 (13:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 17:13:32 +0000 (13:13 -0400)

Trivial merge