Tue, 07 Feb 2012 19:45:45 +0100 laurent Fix some issues regarding arbitrary variable mapping