Merged Cyril Martin pull-request