Merge branch 's17_MDL-30973_file_docblock_master' of git://github.com/dongsheng/moodle

diff --cc mod/assignment/lib.php
Simple merge

diff --cc mod/data/lib.php
Simple merge

diff --cc mod/forum/lib.php
Simple merge

diff --cc mod/glossary/lib.php
Simple merge

diff --cc mod/lesson/lib.php
Simple merge

diff --cc mod/quiz/lib.php
Simple merge

diff --cc mod/scorm/lib.php
Simple merge

diff --cc mod/wiki/lib.php
Simple merge

diff --cc mod/workshop/lib.php
Simple merge