Adding upstream version 0.8.2.