Vendor branch: Upgrade from CVS (7 JUN 2014) to release (20151004)