Vendor branch: Upgrade from CVS (7 JUN 2014) to release (20151004)
treefa9d3c6167f1151c0b145b8bfd3dd660e3107b22
drwxr-xr-x - contrib