Sync'd branch projects/oak with upstream @ Thu Oct  2 23:58:14 PDT 2014