Adding upstream version 0.3.6.3.