Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Fri, 25 Jul 2014 17:45:02 +0000 (18:45 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Fri, 25 Jul 2014 17:45:02 +0000 (18:45 +0100)

Trivial merge