Sync'd branch projects/maple with upstream @ Fri Oct 24 19:57:13 PDT 2014