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