Merge proposals dependent on lp:~onceuponapriori/pysaml2/main

lp:~onceuponapriori/pysaml2/main has no merge proposals.