Update our frodo branch with latest changes from opdenkamp's frodo branch