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