Merge branch 'release/2.5.2' v2.5.2
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 17:57:15 +0000 (13:57 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 17:57:15 +0000 (13:57 -0400)

Trivial merge