Sync'd branch projects/maple with upstream @ Mon Nov 10 06:24:26 PST 2014