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