Sync'd branch projects/oak with upstream @ Tue Sep 30 15:12:10 PDT 2014