Squashed commit of the following:

commit e553bd173e9b85ffe28952bc9c9c8a6dfebb346d
Author: graemewalker <graemewalker@btinternet.com>
Date:   Thu Apr 25 13:10:22 2013 +0800

    blah

commit e2f89d161542ea8cd788934a2a6d49578741a3e2
Author: graemewalker <graemewalker@btinternet.com>
Date:   Thu Apr 25 13:04:05 2013 +0800

    blah