Update to prepare for 2018.4 point release