master-bc-438

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