Sync'd branch projects/maple with upstream @ Tue Sep 16 17:06:12 PDT 2014