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