Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Jun 2016 15:27:21 +0000 (11:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Jun 2016 15:27:21 +0000 (11:27 -0400)

Trivial merge