Sync'd branch projects/jamun with upstream @ Tue Sep  2 22:11:05 PDT 2014