Sync'd branch projects/maple with upstream @ Tue Oct 28 08:47:11 PDT 2014