am 06b2ddd6: am 35cd79c4: Merge commit \'8322a8739996652d56cc2ac3d867c0766715d6f7\' into HEAD

* commit '06b2ddd6545ac11b637ce372894dbd965e81e35b':