Merge changes from Authorea