master-bc-380

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