Sync'd branch projects/jamun with upstream @ Thu Sep 18 12:18:08 PDT 2014