Sync'd branch projects/maple with upstream @ Wed Sep 10 05:45:17 PDT 2014