master-al-96

http://issues.liferay.com/browse/LIFERAYQA-3657