Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Dec 2016 18:56:59 +0000 (13:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 15 Dec 2016 18:56:59 +0000 (13:56 -0500)

Trivial merge