Setup contents on init so as not to loose position.
Merge branch '1.x' into gh-pages