Merge branch 'hotfix/2.10.14' v2.10.14
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Oct 2017 19:03:06 +0000 (15:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Oct 2017 19:03:06 +0000 (15:03 -0400)

Trivial merge