Merge branch 'master' into ad_occasionem
booklet for an unrealized service; unpolished