master-bc-715

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