Imported Upstream version 0.8.4