master-bc-348

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