Added data-intro-text and improved doc on this
Merge branch 'master' into upstream