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