master-bc-483

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