Sync'd branch projects/oak with upstream @ Mon Nov 10 20:19:24 PST 2014