master-bc-336

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