Merge Upstream version 1.6.2

commit f7b92fb08646fc697c854ac9061be29bbefca16e
Author: Christos Trochalakis <yatiohi@ideopolis.gr>
Date:   Wed Sep 17 11:16:18 2014 +0300

    Imported Upstream version 1.6.2

commit 4f63260faf8395e0fefcf060e2eb56a5cb3ced93
Author: Christos Trochalakis <yatiohi@ideopolis.gr>
Date:   Wed Aug 6 09:41:32 2014 +0300

    Imported Upstream version 1.6.1

commit 822eb60b281271b1d04e9b95807b4c5ad839b22a
Author: Christos Trochalakis <yatiohi@ideopolis.gr>
Date:   Wed Aug 6 09:36:39 2014 +0300

    Imported Upstream version 1.6.1