Adding upstream version 0.5.3.