Update from upstream to 3.1.15