Sync'd branch projects/jamun with upstream @ Wed Sep 10 21:19:10 PDT 2014