Sync'd branch projects/oak with upstream @ Mon Sep  1 17:48:07 PDT 2014