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