Sync'd branch projects/maple with upstream @ Mon Nov  3 13:55:16 PST 2014