[rkward] /: Merge branch 'releases/0.6.4'

[Thomas Friedrichsmeier]

Git commit 70f529151774bbe8b8c7fee805b347d6cd0aa949 by Thomas Friedrichsmeier.
Committed on 10/12/2015 at 07:57.
Pushed by tfry into branch 'master'.

Merge branch 'releases/0.6.4'

@Meik: I hope I did the revert+merge correctly. Please check!
(In particular there are some commits on master but not on 0.6.4. This time the changes introduced by these are preserved - in master.)


http://commits.kde.org/rkward/70f529151774bbe8b8c7fee805b347d6cd0aa949