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