Merge branch 'release/2.5.4' v2.5.4
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:00:54 +0000 (13:00 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:00:54 +0000 (13:00 -0400)

Trivial merge