Add 10.1.8 update.
Remove broken files from upstream merge.