Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:34:56 +0000 (11:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:34:56 +0000 (11:34 -0500)

Trivial merge