master-qa-6392

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