Merge tag 'upstream/0.8.0.6'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 16:36:53 +0000 (12:36 -0400)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 15 Apr 2014 16:36:53 +0000 (12:36 -0400)
Upstream version 0.8.0.6


Trivial merge