Imported Upstream version 0.9.4+r4180.20121103