master-bc-765

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