Merge tag 'upstream/0.8.0.5'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 11 Apr 2014 06:50:18 +0000 (08:50 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 11 Apr 2014 06:50:18 +0000 (08:50 +0200)
Upstream version 0.8.0.5


Trivial merge