Work Order #6455
Merge branch 'master' of https://github.com/InSite/Kernel