Update to 1.5.4
Merge branch '1.5.4'