Merge clovis' branch upstream