Latest master with changes to the latex preamble