Doc updates from backports; will release a 1.1.18 version