Sync'd branch projects/oak with upstream @ Tue Sep  2 18:33:07 PDT 2014