Sync'd branch projects/maple with upstream @ Wed Sep 10 07:33:09 PDT 2014