master-al-105

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