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