Possible fix for issue 2005
Merge branch 'v2.1-dev' of github.com:nicolas-raoul/Anki-Android into v2.1-dev