Sync'd branch projects/oak with upstream @ Wed Sep 24 23:38:12 PDT 2014