master-bc-430

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