Remove patches and update to upstream patch release 0.12.1
Merge pull request #3639 from herlo/develop

Remove patches and update to upstream patch release 0.12.1