master-bc-326

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