master-qa-6641

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