Imported Upstream version 0.9.20131104