Fixed booklet undef macro
Merge branch 'master' into ms