Merged soc. rel.
Merge branch 'origin/master'