Sync'd branch projects/maple with upstream @ Wed Oct  1 11:50:12 PDT 2014