Imported Upstream version 2.5.6~git20140801