Sync'd branch projects/maple with upstream @ Tue Sep 16 09:15:09 PDT 2014