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