Upgrade to 3.6.1