Sync'd branch projects/fig with upstream @ Sat Oct  4 17:31:50 PDT 2014