master-qa-4952

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