master-qa-6235

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