Sync'd branch projects/jamun with upstream @ Tue Sep  9 06:10:08 PDT 2014