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