master-bc-375

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