Sync'd branch projects/oak with upstream @ Fri Oct  3 01:57:11 PDT 2014