Merge branch 'master' into 'latex_spellchecking'