Pushed as 3067eb8d60..147f1f2e0d to master.

--
Oleg