Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 21:44:49 +0000 (16:44 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 21:44:49 +0000 (16:44 -0500)

Trivial merge