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