Imported Upstream version 3.1+20140723