Merge branch '2.4' into fixtypos
authorMartin Jul <martin@mjul.com>
Thu, 27 Mar 2014 12:20:48 +0000 (13:20 +0100)
committerMartin Jul <martin@mjul.com>
Thu, 27 Mar 2014 12:20:48 +0000 (13:20 +0100)

Trivial merge