Updated to support Umbraco 7.1.1