Release 2.13.1040

Released on Apr 6, 2017 and includes the following: