Fixed typo
Merge branch '3.6'