Sync'd branch projects/oak with upstream @ Mon Nov 10 21:40:23 PST 2014