SAK-23164 merge trunk r118781 - but had to create the file first

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@118782 66ffb92e-73f9-0310-93c1-f5514f145a0a