Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 20:04:03 +0000 (15:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 20:04:03 +0000 (15:04 -0500)

Trivial merge