Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Jan 2017 22:00:31 +0000 (17:00 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Jan 2017 22:00:31 +0000 (17:00 -0500)

Trivial merge