Merge tag 'upstream/2.3.2' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 7 Feb 2015 19:27:02 +0000 (21:27 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 7 Feb 2015 19:27:02 +0000 (21:27 +0200)
Upstream version 2.3.2


Trivial merge