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