Version Bump

Bump to version 2.1.0 and fix bug 464386 [1] and bug 477810 [2].

[1] https://bugs.gentoo.org/show_bug.cgi?id=464386
[2] https://bugs.gentoo.org/show_bug.cgi?id=477810