master-qa-6041

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