merged from cyclismo
Merge with upstream