Sync'd branch projects/oak with upstream @ Wed Sep 10 06:24:54 PDT 2014