Sync'd branch projects/maple with upstream @ Fri Sep 26 15:10:12 PDT 2014