Revert to 25/03/2013

Bug fixes