Update to 3.6.1, among other updates