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