Merge branch 'latex'
Merge branch 'master' into latex