Merge remote-tracking branch 'ankidroid/v2.1-dev' into v2.1-dev-ospalh-special
Merge remote-tracking branch 'ospalh/v2.1-dev-ospalh-special' into v2.1-dev-ospalh-special