Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 16:39:14 +0000 (11:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 16:39:14 +0000 (11:39 -0500)

Trivial merge