Sync'd branch projects/oak with upstream @ Wed Oct  1 20:49:12 PDT 2014