Sync'd branch projects/maple with upstream @ Mon Oct 27 07:04:37 PDT 2014