Merge upstream

We need 2eaf8fd (for jerry, but probably also others)