Merge branch 'hotfix/2.9.13' v2.9.13
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 3 Apr 2017 19:09:13 +0000 (15:09 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 3 Apr 2017 19:09:13 +0000 (15:09 -0400)

Trivial merge