am b80e18af: am 6a839909: am 089d1a87: am 29541f11: am 7cf64021: am f21e72e3: Merge commit \'276225d7a0b067ae95009d27a6a0764a2e8c61c1\' into HEAD

* commit 'b80e18af00383d2eeec6d0bf65092181be30bafa':