Sync'd branch projects/jamun with upstream @ Tue Sep  9 14:35:57 PDT 2014