am 126afecd: am d47edfda: Merge commit \'9b090b41e514abc72cf8bb8552f6f19ee3b4d03a\' into HEAD

* commit '126afecd3941c27c9488c19d2ccf60cd2c849ab9':