Sync'd branch projects/oak with upstream @ Thu Oct 16 19:21:13 PDT 2014