Sync'd branch projects/oak with upstream @ Sat Nov  8 20:00:21 PST 2014