master-bc-283

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