Merge in changes from latex-box