am 52809674: Merge commit \'8a7420a011840737eb1dfad039cbbb48ce71273a\' into HEAD

* commit '52809674c3dccc30b2a604e36dcd9041a3a75868':