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