Merge pull request #3305 from dbnicholson/pages-fixes #2241

Job	Run time
build	1m 55s
build-git-libostree	2m 50s
Build, minimum supported toolchain (MSRV)	1m 17s
cargo-deny	18s
build-no-features	1m 23s
	7m 43s

Provide feedback