cc-d: Merge branch 'docyx-master'

    no comments