master-qa-5260

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