master-bc-388

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