Sync'd branch projects/oak with upstream @ Thu Oct 23 08:01:15 PDT 2014