Imported Upstream version 2.4+20131018.git79459a2