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