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