Sync'd branch projects/oak with upstream @ Wed Oct 22 19:12:30 PDT 2014