Sync'd branch projects/maple with upstream @ Mon Nov  3 11:19:22 PST 2014