Merge branch 'hotfix/0.0.6' v0.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 15:43:22 +0000 (10:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 15:43:22 +0000 (10:43 -0500)

Trivial merge