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