merge https://phabricator.kde.org/D26774 to master