master-bc-370

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