Merge 20GeV window bias study branch back into master, please

should just be fast-forward.