Sync'd branch projects/jamun with upstream @ Tue Sep  2 12:39:00 PDT 2014