am 943ac81d: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD

* commit '943ac81ddff571f74e1ee9c8d184a56187dc4a60':