master-qa-6341-1

http://issues.liferay.com/browse/LIFERAYQA-6341-1