missing footer include added back
Merging dev into shib-um?
Removing automerge cruft