Sync'd branch projects/maple with upstream @ Tue Oct 14 13:22:23 PDT 2014