Sync'd branch projects/maple with upstream @ Fri Oct 17 08:20:18 PDT 2014