Release 2.18.1505

Released on May 25, 2018 and includes the following: