Merge branch 'bigeasy' into `amalgamate`.
Merge branch `amalgamate` into `master`.