Thu, 29 Mar 2012 18:57:53 +0100 Mario de Sousa merging with Laurent's patch.