master-qa-4260

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