master-qa-6235-1

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