Sync'd branch projects/oak with upstream @ Thu Sep  4 14:10:11 PDT 2014