Merge remote-tracking branch 'origin/master' into v0.8
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 12:39:08 +0000 (14:39 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 12:39:08 +0000 (14:39 +0200)

Trivial merge