Merged from master
authorSébastien Grignard <seb@amakaze.org>
Fri, 10 Jan 2014 22:05:03 +0000 (23:05 +0100)
committerSébastien Grignard <seb@amakaze.org>
Fri, 10 Jan 2014 22:05:03 +0000 (23:05 +0100)

Trivial merge