Merge tag 'upstream/2.3.3+svn1216'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 5 Dec 2015 14:14:36 +0000 (16:14 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 5 Dec 2015 14:14:36 +0000 (16:14 +0200)
Upstream version 2.3.3+svn1216


Trivial merge