Sync'd branch projects/oak with upstream @ Mon Oct  6 13:04:18 PDT 2014