Sakiii 1892

https://jira.sakaiproject.org/browse/SAKIII-1892