Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:57:00 +0000 (11:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:57:00 +0000 (11:57 -0400)

Trivial merge