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