master-al-95

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