Merge branch 'hotfix/2.9.11' v2.9.11
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 16 Mar 2017 20:27:42 +0000 (16:27 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 16 Mar 2017 20:27:42 +0000 (16:27 -0400)

Trivial merge