Imported Upstream version 2014.07.15