Merge branches 'buttons', 'numeric' and 'pdflatex'