Imported Upstream version 2.4+gitfaa33637a8