Wed, 09 May 2012 23:04:03 +0100 mjsousa Merge changes.