master-bc-353

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