am 5a6d77f4: Merge commit \'6922f90b4a983c65a6154cd76766841be3be89fb\' into HEAD

* commit '5a6d77f46032f6eb04263f2a6788042634bae2c2':