Sync'd branch projects/maple with upstream @ Fri Oct 24 17:56:21 PDT 2014