Sync'd branch projects/oak with upstream @ Tue Sep  9 21:43:00 PDT 2014