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)
commitee826bce8c1163dd11862bf1a337266b3a03c1e5
treed7ffaab58714758944d9487bd401d82d862061e2
parent572a2cfc820da0886c4b65f09b7e9553e9a4063a
parent70d9ec088df54394e727985c2607f8703c839042
Merge tag 'v2.5.2' into develop

Updated version #