master-bc-330

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