Release mer-2.5.4-2