Sync'd branch projects/oak with upstream @ Wed Oct  1 08:03:13 PDT 2014