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