Merge pull request #4270 from nxhack/update_to_59_1