master-bc-498

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