Sync'd branch projects/oak with upstream @ Sat Aug 30 21:37:10 PDT 2014