Imported Upstream version 1.3.6
Merge tag 'upstream/1.3.6'

Upstream version 1.3.6
New upstream release