master-qa-6250

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