Merge tag 'upstream/1.3.0'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 22 Apr 2014 08:43:28 +0000 (10:43 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 22 Apr 2014 08:43:28 +0000 (10:43 +0200)
Upstream version 1.3.0


Trivial merge