getting authorea branch up to date with master