Sync'd branch projects/oak with upstream @ Tue Sep 23 01:20:12 PDT 2014