master-qa-5260-1

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