upstream/3.36.1+git20200417

Simon McVittie

@smcv

87fb38d6 · New upstream version 3.36.1+git20200417 · Apr 21, 2020

Upstream version 3.36.1+git20200417