core - Revision 18242: /branches/3.1