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