Keep up with trunk as of revision 4314