Sync'd branch projects/oak with upstream @ Sat Sep 20 14:40:12 PDT 2014