master-qa-4677

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