Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs