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