Sync'd branch projects/oak with upstream @ Wed Oct  8 20:25:17 PDT 2014