master-qa-6059

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