Imported Upstream version 2014.06.07