Sync'd branch projects/maple with upstream @ Wed Sep 10 13:50:12 PDT 2014