Sync'd branch projects/oak with upstream @ Wed Sep 10 07:29:17 PDT 2014