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