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