From: Rogério Brito <rbrito@ime.usp.br>
Date: Fri, 19 May 2017 06:21:46 +0000 (-0300)
Subject: Merge tag 'upstream/2017.05.18.1'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/532a08904ffbacc5e5ccf99edb660c5f37ddb213

Merge tag 'upstream/2017.05.18.1'

Upstream version 2017.05.18.1
---

532a08904ffbacc5e5ccf99edb660c5f37ddb213