Sync'd branch projects/maple with upstream @ Fri Sep 12 12:04:14 PDT 2014