Merge branch 'hotfix/0.0.6' v0.0.6
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Feb 2016 19:34:50 +0000 (14:34 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Feb 2016 19:34:50 +0000 (14:34 -0500)

Trivial merge