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