merge to Fluxbb trunk 1.5.4 (27b7451c00d5a3d58f90d91e71a0d4de509e4f5d)