Merge branch 'master' into release
authorPi user <pi@njae.me.uk>
Mon, 21 Oct 2013 15:46:19 +0000 (16:46 +0100)
committerPi user <pi@njae.me.uk>
Mon, 21 Oct 2013 15:46:19 +0000 (16:46 +0100)

Trivial merge