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