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