Imported Upstream version 0.52