Sync'd branch projects/maple with upstream @ Tue Sep 23 07:36:13 PDT 2014