Sync'd branch projects/maple with upstream @ Tue Oct 28 06:40:18 PDT 2014