Merge branch 'release/2.5.0' v2.5.0
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Aug 2016 17:46:45 +0000 (13:46 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Aug 2016 17:46:45 +0000 (13:46 -0400)

Trivial merge