master-bc-754

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