Release 2.18.1497

Released on May 24, 2018 and includes the following: