Imported Upstream version 0.8.7p1