Sync'd branch projects/jamun with upstream @ Mon Sep  8 11:45:41 PDT 2014