Sync'd branch projects/oak with upstream @ Mon Sep  1 10:00:06 PDT 2014