Sync'd branch projects/maple with upstream @ Sat Sep 27 10:21:11 PDT 2014