am 05ac3808: Merge commit \'d0ad8415a814466a3a46286914fa97d945f10c70\' into HEAD

* commit '05ac38084fee1be0610b3361a4ebcee115871b42':