Sync'd branch projects/maple with upstream @ Tue Oct 28 09:33:14 PDT 2014