Merge tag 'v2.1.25' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 7 Jul 2016 19:04:27 +0000 (15:04 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 7 Jul 2016 19:04:27 +0000 (15:04 -0400)
Kill Yoeast Canonical Links.


Trivial merge