Moved changes from antlatex-script to master.