Upstream version dated 2018-08-05