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