- update trunk -> 3.6