Adding upstream version 0.3.8.1.