K 10 svn:author V 6 tuexen K 8 svn:date V 27 2014-07-11T06:52:48.795606Z K 7 svn:log V 47 Integrate upstream changes. MFC after: 1 week END