Sync'd branch projects/oak with upstream @ Thu Sep  4 09:20:09 PDT 2014