Sync'd branch projects/maple with upstream @ Fri Nov  7 11:20:21 PST 2014