K 10 svn:author V 7 delphij K 8 svn:date V 27 2013-05-31T22:53:44.320263Z K 7 svn:log V 102 Apply vendor commit 654f1b3fc5, this is slight different from our version as discussed with upstream. END