master-bc-750

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