Merge branch 'hotfix/2.1.25' v2.1.25
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 7 Jul 2016 19:04:15 +0000 (15:04 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 7 Jul 2016 19:04:15 +0000 (15:04 -0400)

Trivial merge