master-qa-6021-1

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