master-bc-385

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