Tue, 20 Aug 2013 17:35:11 +0100 mjsousa merge