Sync'd branch projects/oak with upstream @ Thu Sep 18 13:26:17 PDT 2014