2.5.3 -> 2.5.4
update.xml
Merge remote-tracking branch 'origin/MPS2.5'