Sync'd branch projects/maple with upstream @ Wed Nov 12 07:42:27 PST 2014