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