Merge tag 'upstream/2.3.4'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 14 Feb 2016 13:09:35 +0000 (15:09 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 14 Feb 2016 13:09:35 +0000 (15:09 +0200)
Upstream version 2.3.4


Trivial merge