Sync'd branch projects/maple with upstream @ Wed Sep 24 05:22:13 PDT 2014