Sync'd branch projects/oak with upstream @ Fri Oct  3 04:33:46 PDT 2014