Imported Upstream version 2014.08.04