Merge remote-tracking branch 'origin' into v0.8
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 16:07:48 +0000 (18:07 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 16:07:48 +0000 (18:07 +0200)

Trivial merge