Sync'd branch projects/fig with upstream @ Thu Oct  2 15:20:02 PDT 2014