master-bc-702

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