Sync'd branch projects/oak with upstream @ Fri Oct  3 06:29:13 PDT 2014