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