Imported Upstream version 0.5.2
Imported Upstream version 0.5.3