Imported Upstream version 0.9.99.20140718