master-qa-5942

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