Merge branch 'hotfix/2.10.13' v2.10.13
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 9 Oct 2017 12:48:45 +0000 (08:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 9 Oct 2017 12:48:45 +0000 (08:48 -0400)

Trivial merge