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