master-bc-412

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