Sync'd branch projects/maple with upstream @ Fri Oct 31 12:55:09 PDT 2014