master-bc-376

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