Sync'd branch projects/maple with upstream @ Tue Oct 28 12:55:41 PDT 2014