master-bc-433

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