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