Sync'd branch projects/maple with upstream @ Fri Oct 24 06:37:17 PDT 2014