master-bc-323

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