Prepare for 1.3.6