Sync'd branch projects/oak with upstream @ Fri Oct 10 13:43:15 PDT 2014