Sync'd branch projects/oak with upstream @ Sat Nov  8 18:30:29 PST 2014