am e64eccb6: Merge commit \'d2346cad4215e2a5c50f7fd7d6d3f46c80286330\' into HEAD

* commit 'e64eccb68b8101d8fa2effb826e185db7f82dba9':