Sync'd branch projects/maple with upstream @ Tue Nov 11 06:47:25 PST 2014