Merge back from Renaud

Happy birthday to me!