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