Sync'd branch projects/oak with upstream @ Thu Oct  9 09:42:18 PDT 2014