Fixed typo
Merge branch '2.0'