Merge pull request #602 from enjoy-digital/socdoc-extensions