Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 May 2016 15:50:56 +0000 (11:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 May 2016 15:50:56 +0000 (11:50 -0400)

Trivial merge