master-bc-349

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