frosch 0ec8d96ccf Merge r25295 to 1.12 release branch 12 gadi atpakaļ
..
Zend 0ec8d96ccf Merge r25295 to 1.12 release branch 12 gadi atpakaļ