master-bc-704

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