merging trunk into 3.6 branche