Merge tag 'upstream/1.3.1'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 22 Apr 2014 09:08:31 +0000 (11:08 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 22 Apr 2014 09:08:31 +0000 (11:08 +0200)
Upstream version 1.3.1


Trivial merge