Sync'd branch projects/maple with upstream @ Tue Sep 23 11:56:10 PDT 2014