master-bc-342

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