Sync'd branch projects/maple with upstream @ Thu Nov  6 06:58:02 PST 2014