Sync'd branch projects/oak with upstream @ Wed Sep 24 14:45:15 PDT 2014