Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:46:38 +0000 (14:46 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 31 Dec 2015 19:46:38 +0000 (14:46 -0500)

Trivial merge