Merge branch 'hotfix/2.10.16' v2.10.16
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 31 Oct 2017 18:33:55 +0000 (14:33 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 31 Oct 2017 18:33:55 +0000 (14:33 -0400)

Trivial merge