Import new upstream version 2.1.2.0

[aderbenev]

No description provided.

[aderbenev]

@mark0n @mdavidsaver any git guru hint on why my gbp import-orig created the Merge pull request #7 from chrschroeder/upstream commit here? Was the previous upstream update (2.1.1.0) not imported in master properly somehow? I don't see any apparent issues arising from that, but can't understand that effect.

And while you're here, should we get rid of that helper script patch or just let it be?

[mdavidsaver]

gbp import-orig

I would often add --no-merge and then merge upstream into master myself (or rebase the packaging).