Sync'd branch projects/oak with upstream @ Tue Sep 30 18:27:14 PDT 2014