Sync'd branch projects/oak with upstream @ Thu Oct 16 11:12:20 PDT 2014