Merge git://labs.riseup.net/module_common