master-bc-748

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