Merged latest 1.5.4 branch changes to 1.5.4 tag, in preparation for release.


10 files changed