Sync'd branch projects/maple with upstream @ Thu Oct 30 11:38:15 PDT 2014