Sync'd branch projects/oak with upstream @ Tue Sep  2 12:01:23 PDT 2014