Sync'd branch projects/oak with upstream @ Tue Sep  9 19:04:46 PDT 2014