master-bc-387

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