merge version 2.5 (texlive2014) into master