Sync'd branch projects/maple with upstream @ Thu Sep 11 12:06:13 PDT 2014