Updated for Alfresco 4.2.e