Tue, 27 Nov 2012 23:47:22 +0100 Manuele Conti Merge with Mario's changes.