Merge tag 'v2.1.21' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 6 Jul 2016 21:02:49 +0000 (17:02 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 6 Jul 2016 21:02:49 +0000 (17:02 -0400)
Hotfix for canonical detail page URLs and shortcode description cleanup.


Trivial merge