2.5.4 release commit.

support API 1.1.