Merged branches previewpics and master branch.