Imported upstream version '2014.10.10' of 'upstream'
Overlaid patches from 'patch'