master-bc-510

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