master-qa-3259

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