Merge branch 'hotfix/10.0.20' v10.0.20
authorChuck Scott <cscott@gaslightmedia.com>
Sun, 27 Sep 2015 21:06:29 +0000 (17:06 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Sun, 27 Sep 2015 21:06:29 +0000 (17:06 -0400)

Trivial merge