Can we merge the auctex branch?