am f485004f: Merge commit \'d06c58378a85689b9b82a144dc684b071dc6681b\' into HEAD

* commit 'f485004fb17923478ce2953862a71edd246dce3d':