Sync'd branch projects/maple with upstream @ Wed Nov  5 11:45:17 PST 2014