master-bc-378

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