Sync'd branch projects/oak with upstream @ Mon Sep 29 11:46:14 PDT 2014