move fix #1636 to 1.3 branch
move fix #1636 to 1.3 branch

pfreixes/aiohttp,rutsky/aiohttp,hellysmile/aiohttp,alex-eri/aiohttp-1,Eyepea/aiohttp,alex-eri/aiohttp-1,singulared/aiohttp,AraHaanOrg/aiohttp,KeepSafe/aiohttp,AraHaanOrg/aiohttp,arthurdarcet/aiohttp,alex-eri/aiohttp-1,arthurdarcet/aiohttp,juliatem/aiohttp,playpauseandstop/aiohttp,KeepSafe/aiohttp,juliatem/aiohttp,hellysmile/aiohttp,singulared/aiohttp,rutsky/aiohttp,singulared/aiohttp,KeepSafe/aiohttp,pfreixes/aiohttp,arthurdarcet/aiohttp,rutsky/aiohttp