Bump to version 3.6.1 and update changelog