Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Feb 2017 19:54:34 +0000 (14:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Feb 2017 19:54:34 +0000 (14:54 -0500)

Trivial merge