Merge branch 'hotfix/2.1.21' v2.1.21
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 6 Jul 2016 21:02:44 +0000 (17:02 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 6 Jul 2016 21:02:44 +0000 (17:02 -0400)

Trivial merge