Accidentally broke stuff when fixing book class
Merge branch 'master' into full-tikz-header