Sync'd branch projects/maple with upstream @ Thu Sep 11 08:04:09 PDT 2014