Sync 411d58a.
Merge branch '2.0'