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