Sync'd branch projects/oak with upstream @ Tue Sep  2 11:47:08 PDT 2014