rdieter pushed to yakuake (master). "pull in upstream build fix"