master-bc-420

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