Imported Upstream version 2.1.10
Imported Upstream version 2.3.1
Merge tag 'upstream/2.3.1'

Upstream version 2.3.1
remove old patch
USAGE was removed in this verison
remove failing exception
add patch to remove external libs
regen symbols
update changelog for 2.3.1-1~1