Sync'd branch projects/oak with upstream @ Fri Sep  5 06:57:10 PDT 2014