Update patches for master as of 2013-07-22