Merge proposals dependent on lp://staging/~cjohnston/sademos/1604-bootstrap-typo

lp://staging/~cjohnston/sademos/1604-bootstrap-typo has no merge proposals.