master-al-102

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