Sync'd branch projects/maple with upstream @ Wed Sep 10 14:10:11 PDT 2014