Update to 3.18-final.
Merge branch 'master-vanilla-configs' into vanilla
Automatically updated to 3.18-545-gf3f62a3