Merge branch 'development' into presentation-slides
authorNeil Smith <neil.git@njae.me.uk>
Sun, 1 Jun 2014 19:24:49 +0000 (20:24 +0100)
committerNeil Smith <neil.git@njae.me.uk>
Sun, 1 Jun 2014 19:24:49 +0000 (20:24 +0100)

Trivial merge