am c61dbe23: Merge commit \'8eccbd3b5d90b9f0557c9a01f49d45e98ac85a46\' into HEAD

* commit 'c61dbe23a4f2f69af9c674af3dad3759b098eae2':