Sync'd branch projects/jamun with upstream @ Wed Sep 24 09:20:10 PDT 2014