Added more content again.
Merge branch '1.1.0-dev'