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