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)
Updated version to 2.5.4


Trivial merge