master-bc-506

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