Merge tag 'upstream/1.1.3'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 27 Oct 2014 21:23:40 +0000 (22:23 +0100)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 27 Oct 2014 21:23:40 +0000 (22:23 +0100)
Upstream version 1.1.3


Trivial merge