Update from pressbooks/pressbooks master

keeping this dev branch up to date with upstream branch