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