master-bc-374

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