Merge commit \'4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582\' into HEAD
am: af05ad919a

* commit 'af05ad919aca901bbadabad5988ad77e8426e1e2':