master-al-100

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