Sync'd branch projects/oak with upstream @ Fri Oct  3 07:32:20 PDT 2014