Sync'd branch projects/maple with upstream @ Tue Sep 30 19:26:09 PDT 2014