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