Merge branch 'hotfix/1.0.7' V1.0.8 v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 20:05:41 +0000 (15:05 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 20:05:41 +0000 (15:05 -0500)

Trivial merge