Prepare for 3.6.1 release