Updated the patch for newest revision on trunk.