6625bff
Update to latest released upstream version 2.1.0 (cherry picked from commit 27d612fd39b7ae1608ad19c00a1305603128a714)