Merge 3.6.1rc1 releasing branch into 3.6