Merge tag 'v2.5.2' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 17:57:26 +0000 (13:57 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 17:57:26 +0000 (13:57 -0400)
Updated version #


Trivial merge