Sync'd branch projects/oak with upstream @ Mon Sep 29 08:38:15 PDT 2014