Merge tag 'v2.5.4' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:01:07 +0000 (13:01 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:01:07 +0000 (13:01 -0400)
commit85cfa8506424f0b973c58703b833ae86eaff88c0
tree9aa81b24ae96d4ca95f22568044b1e53a4a0c188
parentbab2c176b07073df0a41a9f75d65812c948a1f0b
parent8ac38da9db79b155a56d4743c81027f690f2a12b
Merge tag 'v2.5.4' into develop

Updated version to 2.5.4