master-qa-6051

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