updated from 3.18-RCs to final 3.18.0 release