Merge proposals dependent on lp://staging/~toykeeper/qakit/add-pt-to-html

lp://staging/~toykeeper/qakit/add-pt-to-html has no merge proposals.