Merge branch 'hotfix/2.9.17' v2.9.17
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 1 Jun 2017 18:20:42 +0000 (14:20 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 1 Jun 2017 18:20:42 +0000 (14:20 -0400)

Trivial merge