Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:26:48 +0000 (14:26 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:26:48 +0000 (14:26 -0500)

Trivial merge